From 7324be3c3a4419d396a820151c889bba9811f185 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 27 Feb 2006 14:08:06 +0000 Subject: [PATCH] map "gtk-touchscreen-mode" to the "Gtk/TouchscreenMode" XSettings 2006-02-27 Michael Natterer * gdk/x11/gdksettings.c: map "gtk-touchscreen-mode" to the "Gtk/TouchscreenMode" XSettings property, remove trailing whitespace. * gdk/x11/checksettings.c: #include and sprinkled some newlines. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ gdk/x11/checksettings.c | 6 ++++++ gdk/x11/gdksettings.c | 12 +++++++----- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5e3dd1c55..3dd85b7565 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-02-27 Michael Natterer + + * gdk/x11/gdksettings.c: map "gtk-touchscreen-mode" to the + "Gtk/TouchscreenMode" XSettings property, remove trailing + whitespace. + + * gdk/x11/checksettings.c: #include and sprinkled some + newlines. + Mon Feb 27 14:52:50 2006 Tim Janik * gdkevents-x11.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d5e3dd1c55..3dd85b7565 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2006-02-27 Michael Natterer + + * gdk/x11/gdksettings.c: map "gtk-touchscreen-mode" to the + "Gtk/TouchscreenMode" XSettings property, remove trailing + whitespace. + + * gdk/x11/checksettings.c: #include and sprinkled some + newlines. + Mon Feb 27 14:52:50 2006 Tim Janik * gdkevents-x11.c: diff --git a/gdk/x11/checksettings.c b/gdk/x11/checksettings.c index ee47cab60d..ea6ca3a258 100644 --- a/gdk/x11/checksettings.c +++ b/gdk/x11/checksettings.c @@ -16,13 +16,17 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#include #include #include "gdksettings.c" + int main (int argc, char *argv[]) { guint i, accu = 0; + for (i = 0; i < GDK_SETTINGS_N_ELEMENTS(); i++) { if (gdk_settings_map[i].xsettings_offset != accu) @@ -33,6 +37,8 @@ main (int argc, accu += strlen (gdk_settings_names + accu) + 1; // g_print ("%u) ok.\n", i); } + g_print ("checksettings: all ok.\n"); + return 0; } diff --git a/gdk/x11/gdksettings.c b/gdk/x11/gdksettings.c index 87bc2f44ae..654998d7a2 100644 --- a/gdk/x11/gdksettings.c +++ b/gdk/x11/gdksettings.c @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ @@ -29,13 +29,13 @@ #define GDK_SETTINGS_X_NAME(nth) (gdk_settings_names + gdk_settings_map[nth].xsettings_offset) #define GDK_SETTINGS_GDK_NAME(nth) (gdk_settings_names + gdk_settings_map[nth].gdk_offset) -static const char gdk_settings_names[] = +static const char gdk_settings_names[] = "Net/DoubleClickTime\0" "gtk-double-click-time\0" "Net/DoubleClickDistance\0" "gtk-double-click-distance\0" "Net/DndDragThreshold\0" "gtk-dnd-drag-threshold\0" "Net/CursorBlink\0" "gtk-cursor-blink\0" "Net/CursorBlinkTime\0" "gtk-cursor-blink-time\0" - "Net/ThemeName\0" "gtk-theme-name\0" + "Net/ThemeName\0" "gtk-theme-name\0" "Net/IconThemeName\0" "gtk-icon-theme-name\0" "Gtk/CanChangeAccels\0" "gtk-can-change-accels\0" "Gtk/ColorPalette\0" "gtk-color-palette\0" @@ -64,7 +64,8 @@ static const char gdk_settings_names[] = "Xft/HintStyle\0" "gtk-xft-hintstyle\0" "Xft/RGBA\0" "gtk-xft-rgba\0" "Xft/DPI\0" "gtk-xft-dpi\0" - "Net/FallbackIconTheme\0" "gtk-fallback-icon-theme\0"; + "Net/FallbackIconTheme\0" "gtk-fallback-icon-theme\0" + "Gtk/TouchscreenMode\0" "gtk-touchscreen-mode\0"; static const struct { @@ -105,5 +106,6 @@ static const struct { 1165, 1179 }, { 1197, 1206 }, { 1219, 1227 }, - { 1239, 1261 } + { 1239, 1261 }, + { 1285, 1305 } }; -- 2.30.2